Add Fulu boilerplate #6695

macladson · 2024-12-14T11:44:04Z

Proposed Changes

Adds Fulu fork boilerplate.

Additional Info

This makes no attempt to unify Fulu with PeerDAS. This will need to be a separate PR.

beacon_node/beacon_chain/src/beacon_chain.rs

beacon_node/beacon_chain/src/test_utils.rs

beacon_node/execution_layer/src/engine_api/http.rs

common/eth2_network_config/built_in_network_configs/mainnet/config.yaml

dapplion · 2025-01-07T11:29:50Z

@macladson I've applied the fork_enabled pattern on the remaining places where it is possible in this commit a543765 please review and consider cherry-picking into this PR

To motivate my case against the match fork_name:

Relying on the type system to direct our dev attention to certain places would make sense ONLY if we add a new variant to ForkName once the fork is fully spec'ed. Otherwise (like here, now) we just fill all those match cases assuming the fork is empty, losing the all benefits of this approach. Let's accept that we are unlikely to wait for a full spec before adding the boilerplate.

macladson · 2025-01-07T13:42:11Z

Thanks for the commit! I agree with your reasoning and I've cherry-picked it into the main branch.

I ended up reverting the web3signer.rs changes as it actually uses a local variant of ForkName not types::ForkName so to remove that boilerplate, we'd either need to write a mapping from types::ForkName => web3signer::ForkName or rewrite the web3signer to use types::ForkName. I can't comment on why types::ForkName was chosen in the first place, but either way, it feels out of scope for this PR.

dapplion

Looks great! Send it

jimmygchen

Nice work @macladson and thanks for the review @dapplion! I've added a few more comments, let me know what you think. I think we can merge this soon 🎉

beacon_node/beacon_chain/src/beacon_block_streamer.rs

beacon_node/beacon_chain/src/fulu_readiness.rs

lcli/src/mock_el.rs

beacon_node/beacon_chain/src/test_utils.rs

beacon_node/execution_layer/src/engine_api/http.rs

consensus/types/src/config_and_preset.rs

consensus/types/src/beacon_state.rs

testing/ef_tests/src/cases/operations.rs

consensus/types/src/beacon_block.rs

jimmygchen

Looks great, thanks @macladson!

michaelsproul · 2025-01-10T01:34:52Z

@mergify queue

mergify · 2025-01-10T01:35:05Z

queue

🛑 The pull request has been removed from the queue `default`

Pull request #6695 has been dequeued by a dequeue command.

You can take a look at Queue: Embarked in merge queue check runs for more details.

In case of a failure due to a flaky test, you should first retrigger the CI.
Then, re-embark the pull request into the merge queue by posting the comment
@mergifyio refresh on the pull request.

michaelsproul · 2025-01-10T03:15:48Z

@mergify dequeue

mergify · 2025-01-10T03:15:57Z

This pull request has been removed from the queue for the following reason: pull request dequeued.

Pull request #6695 has been dequeued by a dequeue command

You should look at the reason for the failure and decide if the pull request needs to be fixed or if you want to requeue it.

If you want to requeue this pull request, you need to post a comment with the text: @mergifyio requeue

mergify · 2025-01-10T03:15:58Z

dequeue

✅ The pull request has been removed from the queue `default`

michaelsproul · 2025-01-10T03:18:42Z

@mergify requeue

mergify · 2025-01-10T03:18:52Z

requeue

✅ This pull request will be re-embarked automatically

The followup queue command will be automatically executed to re-embark the pull request

mergify · 2025-01-10T03:18:53Z

queue

🛑 The pull request has been removed from the queue `default`

Pull request #6695 has been dequeued by a dequeue command.

You can take a look at Queue: Embarked in merge queue check runs for more details.

In case of a failure due to a flaky test, you should first retrigger the CI.
Then, re-embark the pull request into the merge queue by posting the comment
@mergifyio refresh on the pull request.

michaelsproul · 2025-01-10T03:26:07Z

@mergify dequeue

mergify · 2025-01-10T03:26:21Z

This pull request has been removed from the queue for the following reason: pull request dequeued.

Pull request #6695 has been dequeued by a dequeue command

You should look at the reason for the failure and decide if the pull request needs to be fixed or if you want to requeue it.

If you want to requeue this pull request, you need to post a comment with the text: @mergifyio requeue

mergify · 2025-01-10T03:26:21Z

dequeue

✅ The pull request has been removed from the queue `default`

michaelsproul · 2025-01-10T03:26:24Z

@macladson this needs some updates for the clippy lints https://github.com/sigp/lighthouse/actions/runs/12702656555/job/35409240281?pr=6785

michaelsproul · 2025-01-10T03:39:05Z

@mergify queue

mergify · 2025-01-10T03:39:23Z

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at ecdf2d8

Add Fulu boilerplate

be7b83d

macladson added the work-in-progress PR is a work-in-progress label Dec 14, 2024

macladson added 3 commits December 17, 2024 19:48

Add more boilerplate

53f802b

Change fulu_time to osaka_time

7492414

Merge branch 'unstable' into fulu-boilerplate

90c57d9

dapplion reviewed Dec 18, 2024

View reviewed changes

beacon_node/beacon_chain/src/beacon_chain.rs Outdated Show resolved Hide resolved

dapplion reviewed Dec 18, 2024

View reviewed changes

macladson added 5 commits January 3, 2025 14:58

Fix tests

17f264f

Merge branch 'unstable' into fulu-boilerplate

16f0669

More test fixes

8ff46d4

Apply suggestions

cc05c5b

Remove get_payload boilerplate

3909fef

macladson and others added 4 commits January 7, 2025 23:18

Add lightclient fulu types and fix beacon-chain-tests

1f903c8

Disable Fulu in ef-tests

cd0c2ab

Reduce boilerplate for future forks

2ea9207

Small fixes

c0e629d

macladson added ready-for-review The code is ready for review fulu Required for the upcoming Fulu hard fork and removed work-in-progress PR is a work-in-progress labels Jan 7, 2025

One more fix

f808215

dapplion approved these changes Jan 8, 2025

View reviewed changes

jimmygchen requested changes Jan 9, 2025

View reviewed changes

jimmygchen added waiting-on-author The reviewer has suggested changes and awaits thier implementation. and removed ready-for-review The code is ready for review labels Jan 9, 2025

Apply suggestions

c9332ae

macladson requested a review from jxs as a code owner January 9, 2025 05:24

macladson added ready-for-review The code is ready for review and removed waiting-on-author The reviewer has suggested changes and awaits thier implementation. labels Jan 9, 2025

jimmygchen added the ready-for-merge This PR is ready to merge. label Jan 9, 2025

jimmygchen approved these changes Jan 9, 2025

View reviewed changes

mergify bot added a commit that referenced this pull request Jan 10, 2025

Merge of #6695

ac67aa4

This was referenced Jan 10, 2025

merge queue: embarking unstable (a244aa3) and [#6774 + #6745 + #6695] together #6783

Closed

Add missing crates to cargo workspace #6774

Merged

Use oldest_block_slot to break off pruning payloads #6745

Merged

mergify bot added a commit that referenced this pull request Jan 10, 2025

Merge of #6695

adc33c1

mergify bot mentioned this pull request Jan 10, 2025

merge queue: embarking unstable (a244aa3) and [#6774 + #6745 + #6695] together #6785

Closed

7 tasks

michaelsproul added the waiting-on-author The reviewer has suggested changes and awaits thier implementation. label Jan 10, 2025

macladson added 2 commits January 10, 2025 14:34

Merge branch 'unstable' into fulu-boilerplate

f2af64a

Fix lints

93e79db

macladson removed the waiting-on-author The reviewer has suggested changes and awaits thier implementation. label Jan 10, 2025

mergify bot added a commit that referenced this pull request Jan 10, 2025

Merge of #6695

f46437a

mergify bot mentioned this pull request Jan 10, 2025

merge queue: embarking unstable (a244aa3) and [#6745 + #6695] together #6788

Closed

8 tasks

mergify bot merged commit ecdf2d8 into sigp:unstable Jan 10, 2025
26 of 30 checks passed

jimmygchen mentioned this pull request Jan 10, 2025

Activate PeerDAS at Fulu Fork and remove EIP7594_FORK_EPOCH #6706

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Fulu boilerplate #6695

Add Fulu boilerplate #6695

macladson commented Dec 14, 2024 •

edited

Loading

dapplion commented Jan 7, 2025 •

edited

Loading

macladson commented Jan 7, 2025

dapplion left a comment

jimmygchen left a comment

jimmygchen left a comment

michaelsproul commented Jan 10, 2025

mergify bot commented Jan 10, 2025 •

edited

Loading

michaelsproul commented Jan 10, 2025

mergify bot commented Jan 10, 2025

mergify bot commented Jan 10, 2025

michaelsproul commented Jan 10, 2025

mergify bot commented Jan 10, 2025

mergify bot commented Jan 10, 2025 •

edited

Loading

michaelsproul commented Jan 10, 2025

mergify bot commented Jan 10, 2025

mergify bot commented Jan 10, 2025

michaelsproul commented Jan 10, 2025

michaelsproul commented Jan 10, 2025

mergify bot commented Jan 10, 2025 •

edited

Loading

Add Fulu boilerplate #6695

Add Fulu boilerplate #6695

Conversation

macladson commented Dec 14, 2024 • edited Loading

Proposed Changes

Additional Info

dapplion commented Jan 7, 2025 • edited Loading

macladson commented Jan 7, 2025

dapplion left a comment

Choose a reason for hiding this comment

jimmygchen left a comment

Choose a reason for hiding this comment

jimmygchen left a comment

Choose a reason for hiding this comment

michaelsproul commented Jan 10, 2025

mergify bot commented Jan 10, 2025 • edited Loading

🛑 The pull request has been removed from the queue default

michaelsproul commented Jan 10, 2025

mergify bot commented Jan 10, 2025

mergify bot commented Jan 10, 2025

✅ The pull request has been removed from the queue default

michaelsproul commented Jan 10, 2025

mergify bot commented Jan 10, 2025

✅ This pull request will be re-embarked automatically

mergify bot commented Jan 10, 2025 • edited Loading

🛑 The pull request has been removed from the queue default

michaelsproul commented Jan 10, 2025

mergify bot commented Jan 10, 2025

mergify bot commented Jan 10, 2025

✅ The pull request has been removed from the queue default

michaelsproul commented Jan 10, 2025

michaelsproul commented Jan 10, 2025

mergify bot commented Jan 10, 2025 • edited Loading

✅ The pull request has been merged automatically

macladson commented Dec 14, 2024 •

edited

Loading

dapplion commented Jan 7, 2025 •

edited

Loading

mergify bot commented Jan 10, 2025 •

edited

Loading

🛑 The pull request has been removed from the queue `default`

✅ The pull request has been removed from the queue `default`

mergify bot commented Jan 10, 2025 •

edited

Loading

🛑 The pull request has been removed from the queue `default`

✅ The pull request has been removed from the queue `default`

mergify bot commented Jan 10, 2025 •

edited

Loading